Update alignof patch

diff --git a/debian/changelog b/debian/changelog
index b810f9d45b08517d8af38bc3576be7b9fa18d3c5..c39cc593562fa2495dd81b6035f131a446a6b096 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-dcmtk (3.6.1~20160216-2) UNRELEASED; urgency=medium
+dcmtk (3.6.1~20160216-2) unstable; urgency=medium
 
   * d/p/08: remove SYSTEM_PROCESSOR usage for reproducible builds 
   * d/p/09: add patch to enable compileing against openssl-1.1
     Closes: #828281
+  * d/p/04: update patch to remove duplicate entries
 
  -- Gert Wollny <gw.fossdev@gmail.com>  Thu, 26 May 2016 15:47:40 +0000
 

diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
index c03769dce900c9a10ae712d23c72643a1ae2250a..84d18e38b07a71c59d37e89bee0c397063b2b55c 100644 (file)
--- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
+++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
@@ -19,19 +19,10 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
 \r
 --- a/CMake/osconfig.h.in
 +++ b/CMake/osconfig.h.in
-@@ -1137,4 +1137,16 @@
+@@ -1137,4 +1137,7 @@
  /* The path on the Android device that should be used for temporary files */
  #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
  
-+/* Define if the compiler supports __alignof__ */
-+#cmakedefine HAVE_GNU_ALIGNOF
-+
-+/* Define if the compiler supports __alignof */
-+#cmakedefine HAVE_MS_ALIGNOF
-+
-+/* Define if the compiler supports __attribute__(aligned) */
-+#cmakedefine HAVE_ATTRIBUTE_ALIGNED
-+
 +/* Define if the compiler supports __declspec(align) */
 +#cmakedefine HAVE_DECLSPEC_ALIGN
 +